Merge "Merge RP1A.200720.011" into stage-aosp-master