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