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