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