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