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