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