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