Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into...
Merge "Merge "Run performInitialGrantsIfNecessaryAsync() on main thread." into qt-dev am: eb90b66c" into qt-dev-plus-aosp
am: 5605531b
Change-Id: I02f85d52f683d6a13ae0f906e9356da01f1ba16f