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