Merge "RESTRICT AUTOMERGE" into stage-aosp-master