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