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