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