Merge the 2020-10-05 SPL branch from AOSP-Partner

* security-aosp-pi-release:
  Correct vulnerability when setting pending intents on import/export notifications by setting FLAG_IMMUTABLE

Change-Id: Ic146b4178d24d3243fd107074a2afefa6f0346d0