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