Merge changes from topics "presubmit-am-2762060c253b4c4db3c4db805c2e5b6e", "presubmit-am-3d21c3ff86734d9ba296b2671441db03", "presubmit-am-681cf6c0b8f240f59da390f09a7ef2ed", "presubmit-am-82dac8e1bb1747dcb76dbda3f29e55c9", "presubmit-am-c01cdff8b5e44804ab8a37c5cdc295d5" into tm-dev am: a8fafc5a am: 59674a2a

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

Change-Id: Id58e86637b71d361304f65d0e0c5ee7a2ab2b5eb