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