tree 47b388e2be784cea874436dcacaf9c1a2a5720d2
parent ac08ce7bff42facbf2f74e4775210aab7147b043
parent 5bca01a1a7e77d38ad0927ba42ccbfcddcb24ff8
author Karsten Tausche <karsten@fairphone.com> 1611134075 +0100
committer Karsten Tausche <karsten@fairphone.com> 1611134075 +0100

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