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

* dev/11/fp3/security-aosp-rvc-release:
  Adjust APIs for CUPS 2.3.3

Change-Id: I7eef80bc6b60192bccfc356b681b4e5c59d0872f