Merge changes from topic "presubmit-am-71660657eec14452ab0d6797d0181795" into tm-dev am: f862bd9e am: 50762137

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

Change-Id: Ief26fc61090c24a2f0e96865169fa8b18c25fcfa