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