Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17924962 Change-Id: Iedbf64315620ccb3cf506d12c5598e6eaa20980a Ignore-AOSP-First: this is an automerge Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>