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