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