Merge changes from topic "presubmit-am-b14a56dfc63a4a75a36aa0dcff9f1332" into sc-v2-dev-plus-aosp

* changes:
  [automerge] Fix StatusBar test 2p: 68afc54a39
  Fix StatusBar test