Merge branch 'dev/10/fp2/security-aosp-qt-release' into int/10/fp2

* dev/10/fp2/security-aosp-qt-release:
  enforce stricter CallLogProvider query

Change-Id: I725b19fad69ce695ebd25f13a95c795bfdc7247e