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

* dev/11/fp3/security-aosp-rvc-release:
  Check dir path before updating permissions.

Change-Id: Ia977ad7fbc4184829dfc09e0637d56ac336548f6