Merge "[DO NOT MERGE] Don't show account access request UI until app launched." into nyc-mr1-dev am: 32ce3c8797 am: 81f0e66a13
am: 276e30ba69  -s ours

Change-Id: I6452197d1e1d36d1fa8d668ef836e3f2f183a5f4