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