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