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