tree baa3f4e1d94058748b71740b590d2fe5b382ae67
parent a1ec00b9801e0011f73476dcac15e65cf51a535c
parent f8d26e5839cb6bce5b1317e1bf4be795f4d0b2db
author Maarten Derks <maarten@fairphone.com> 1638961870 +0100
committer Maarten Derks <maarten@fairphone.com> 1638961870 +0100

Merge branch 'security-aosp-pi-release' into int/p/fp2

* security-aosp-pi-release:
  DO NOT MERGE KeyChain protect against overlays.
  DO NOT MERGE Hide overlay on KeyChainActivity

Change-Id: I1cf11c2aaf60c694a05bce996b95f85631ca82c4