Merge changes from topic "am-27a648e904a24343a906b1cbf6cd15b6"

* changes:
  [automerger skipped] Merge "Fix car notification click issue for os test case" into android13-tests-dev am: b3849d86f0 -s ours
  [automerger skipped] Fix car notification click issue for os test case am: 0b81ef5972 -s ours