Merge tag 'android-security-10.0.0_r54' into int/10/fp2

Android Security 10.0.0 Release 54 (7250004)

* tag 'android-security-10.0.0_r54':
  RESTRICT AUTOMERGE Enable stricter SQLiteQueryBuilder options.
  Trigger mediascan after a download is completed.
  Don't canonicalize app paths in system.
  Fix NPE in DownloadProvider.
  Revert SQLiteQueryBuilder for now.

Change-Id: I738814e5170a1254760166fd836bbccb49d7519c