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