Merge changes from topic "am-76a57a8751da4664bc95f5dd68849e12" into main

* changes:
  [automerger skipped] Merge "[DO NOT MERGE][CDM] Fix setSkipPrompt on Android S" into sc-v2-dev am: 11a7319a -s ours am: 627dcbed -s ours am: 79e2846b -s ours am: 698784d0 -s ours am: cdba055a -s ours am: b1e5391d -s ours
  [automerger skipped] [DO NOT MERGE][CDM] Fix setSkipPrompt on Android S am: be2e3b05 -s ours am: ad393387 -s ours am: 9c4bda09 -s ours am: f071edf7 -s ours am: f4ce1257 -s ours am: ac3c8065 -s ours