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