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