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