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