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