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