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