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