[automerger skipped] Merge "RESTRICT AUTOMERGE" into stage-aosp-master am: feeb3bcd39 -s ours

am skip reason: subject contains skip directive

Change-Id: I7020e784a2b4b51da8b276bb3b9ee35ce08b2e4e