Android Q Preview 4 (QPP4.190502.018)
Merge "Adding thread safety to proto uploader"