Merge "[Privacy] Compare app signing certificates before restoring backed up permissions to apps" into tm-mainline-prod