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