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