Merge the 2021-02-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  DO NOT MERGE: Hide overlays over uninstall confirm dialog
  RESTRICT AUTOMERGE Don't allow tapjacking permissioncontroller

Change-Id: I92104994fb0d31cd1d17eec59e412675a159cb68