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