Merge changes from topic "am-242a9b60807641619f7dc590346c6a66" into tm-dev

* changes:
  [automerger skipped] Merge changes from topic "presubmit-am-b14a56dfc63a4a75a36aa0dcff9f1332" into sc-v2-dev-plus-aosp am: 55b3a401ed -s ours
  [automerger skipped] [automerge] Fix StatusBar test 2p: 68afc54a39 am: 31d394cb0e -s ours