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