Merge "[DO NOT MERGE] Backup account access grants am: 72ed12c55f am: 0dc4ff0753" into nyc-mr1-dev-plus-aosp
am: 2bd703d3f3  -s ours

Change-Id: I078df897a3f893aab1946960e4a1a4f429304d77