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