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