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