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