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