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