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