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

* dev/11/fp3/security-aosp-rvc-release:
  DO NOT MERGE: Update password check for WAPI

Change-Id: I7db4288c26db54d7ac376826f2bda6503e34d606