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