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