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