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