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