Merge branch 'dev/11/fp3/security-aosp-rvc-release' into int/11/fp3

* dev/11/fp3/security-aosp-rvc-release:
  Cherrypick following three changes
  DO NOT MERGE - Cherry-pick two upstream changes

Change-Id: Icfb369267820f5ffd762461f8231a45def8f6a30