[automerger skipped] Merge QQ1A.191205.011 into stage-aosp-master am: 2df9e73087 -s ours
am: 4421c220a1 -s ours
am skip reason: change_id Ia6cc7e602fc7c4a6fab2469563c3b6ba86785e20 with SHA1 dd50335142 is in history

Change-Id: I6207ffa2faa19923f8281315e0bccb208cbe480c
tree: fb7ec8418ca7a32d86f09e084bab8d7324d30597
  1. PermissionController/