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