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