[automerger skipped] Merge "Revert "RESTRICT AUTOMERGE: Manually merge 885aca1bbaa076b11914b9e4cb0d2a6d0c6fab3a to aosp-master"" am: 539c545dc7 -s ours
am: 006f754345 -s ours
am skip reason: subject contains skip directive

Change-Id: I4bfc5f1825b55ae6a7fa69b1b3b5a56509f15ee5