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