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

Change-Id: I6faf74abbb08c0b86a2d976fdcf4250808e20243