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