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

* origin/dev/11/fp3/security-aosp-rvc-release:
  enforce stricter CallLogProvider query

Change-Id: I03793a0f909dd89537f1fd78d07a9cbe51951458