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