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