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

* security-aosp-tm-release:
  DO NOT MERGE: Consolidate queryChildDocumentsXxx() implementations

Change-Id: I29b7490f968aeaf22b733b4797ff0c49a4d230c2