Merge "[automerger skipped] [DO NOT MERGE][CDM] Fix a security issue that allow 3p apps to skip prompt by setSkipPrompt am: 8a1346ce7a -s ours am: 2a88b66d6b -s ours am: 56c8619240 -s ours am: 2cc5724827 -s ours am: 7210bb82c2 -s ours am: 6ad221db42 -s ours am: 168dbdc269 -s ours" into main