Merge "[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: f28e88e53d -s ours am: 522be97f20 -s ours am: a55309bd70 -s ours am: c6433f1d7f -s ours am: c7a6e9b41e -s ours" into main