Merge "Mark RP1A.200720.001 as merged" into stage-aosp-master