[automerger skipped] Merge "Move permissions from base to standard manifest"...
[automerger skipped] Merge "Move permissions from base to standard manifest" am: 95c5375a am: f0762100
am: ad7cdd2b -s ours
am skip reason: change_id Ica63ce586e701b1f2415a97f63ba27cc25e4830a with SHA1 d4cbba8f is in history
Change-Id: I71e11fcb1f80f17fd873aea1c14263b7edc814d2