Merge changes from topics "presubmit-am-57df09df9e9348a88546e2cb192e5c28",...

Merge changes from topics "presubmit-am-57df09df9e9348a88546e2cb192e5c28", "presubmit-am-787ed0a55f5040968a8a9c14764ddd01" into tm-dev am: 598ddd81

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

Change-Id: Ie723bb1bc1362158c1b27f3724f59631acb49119