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