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