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