Merge branch 'security-aosp-tm-release' into int/13/fp3

* security-aosp-tm-release:
  Update password check for WAPI

Change-Id: I148b6fe28f3f3d5fcf7b731b9f8d25e87b929753