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

* dev/11/fp3/security-aosp-rvc-release:
  Fix permission bypass in legacy shortcut

Change-Id: Ic3c41cb8a61247759f312678de92f2354feb9661