Merge "Ensure adb key store is instantiated before revoking grants" into qt-qpr1-dev am: b6f974b26b

Change-Id: Id74c5ed51d744c87bbba23f23cc7cf034ab66e4e