tree 8900ce760ea61a29858fe6aed4bbbeaa84d47764
parent ffee0ed529451a832d9da16dccff2669ff875394
parent 3eeec2c1cbeec236614dbd0b8104f02dbfcd3e4e
author Maarten Derks <maarten@fairphone.com> 1633511783 +0200
committer Maarten Derks <maarten@fairphone.com> 1633511783 +0200

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

* security-aosp-pi-release:
  Add permission to start NFC activity to ensure it is from NFC stack

Change-Id: I8f0e06593fccf57a30da2c936ac4ef8cfa1cce8f