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