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