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