Revert "RESTRICT AUTOMERGE: Manually merge d766c24a5117020998baaa007bafb530f287f019 to aosp-master" This reverts commit 569d8d832643b9716a2bc898000ff5661c62858a. Reason for revert: mistakenly used "RESTRICT AUTOMERGE" on the title. Change-Id: I7ec9917887763912114405ba89eb5f0fac328d97