Merge changes from topic "presubmit-am-b07c53c40c7a488890bf5c1d4084ea9d" into sc-mainline-prod am: 8471eee4 am: 1d8ca33c

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

Change-Id: I9542cb2e56c370288ee18defefae3c3bdef892ab