[automerger skipped] Merge "Remove deprecated unenforced permission from manifest." am: 4f9933a6dc am: 13a91673a8 -s ours am: d1ddeb530e -s ours am: 4de71e9841 -s ours

am skip reason: Change-Id I4d1bbd6360ba955ccdeb72427d5d44460999cd06 with SHA-1 d79f91f743 is in history

Change-Id: I981120cc0a9b0db16fbbabcc8c755995720a47ac