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