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