Merge "Merge "[DO NOT MERGE] Backup account access grants" into nyc-mr1-dev am: ae9fa16bd0 am: 3b57299d0b" into nyc-mr1-dev-plus-aosp