Merge changes from topic "presubmit-am-71660657eec14452ab0d6797d0181795" into tm-dev am: f862bd9ec1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17062448 Change-Id: I156c202efbd63b7d3671fd8742aed43196411780
This commit is contained in: