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