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