Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16908080 Change-Id: I7843acc6edf27ed2d8eece6dc2de7a05aa925b9b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>