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