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

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

Change-Id: I7c70ceb7647ed8cf39cd01a7eb1c529e9a9902ef