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