Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24555974



Change-Id: I8523457e9d4c144ab32b0406af7f506f893d16a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>