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