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