Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Fix vulnerability in CallRedirectionService.

Change-Id: I95ffb5bbcb0410e0f005190f8f910862ce7ae929