[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bba to aosp-master""
am: 539c545dc7 -s ours
am skip reason: subject contains skip directive
Change-Id: I6ec149021a6e62e43c7d671e7ae55b2c59a728cc
This commit is contained in: