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