Merge "Force disable PlayServices OTA checks" into p9.0