Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1540224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I86021070223e8825ba19bd84946ef89b56dc3f35