Merge "Merge "Solve AppBackupUtils.signaturesMatch() policies" into oc-mr1-dev am: a743c01d00" into oc-mr1-dev-plus-aosp
am: 13889d75c7

Change-Id: Ifd1afbf731cfb10d2e37d86d0c5b1d64011eb9d6