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

* security-aosp-pi-release:
  Add HIDE_NON_SYSTEM_OVERLAY_WINDOWS permission to Nfc

Change-Id: I539e3774c0c6a743bae64927f23630748d08d9ee