Cherry-pick I111dbda3418edf4fcf34aa26f39dc6ce662f2e5d am: e7ce67f421 am: 5dee4c0e44
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13419308 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie614ac590424a53c58441750d66aa0ba02122c6c
This commit is contained in: