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