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

* security-aosp-pi-release:
  Add FLAG_IMMUTABLE to PendingIntent in LegacyModeSmsHandler.

Change-Id: I4382c7abb1120adef40260c354ebe8a039cdf996