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