Merge changes from topic "am-9d3f5875588c46bbb87389a538b25210" into main

* changes:
  [automerger skipped] Merge "Update media visibility on lock screen" into sc-qpr1-dev am: 201a2e12 -s ours am: c4ad255e -s ours am: 1dfa9572 -s ours am: 46a39fcb -s ours am: d11b0d9d -s ours am: 745f3f43 -s ours am: d897055e -s ours
  [automerger skipped] Update media visibility on lock screen am: a8519e46 -s ours am: a02f88b0 -s ours am: 42d996ac -s ours am: f2cf250f -s ours am: ba2f12e8 -s ours am: fa9bc4df -s ours am: 881b11fd -s ours