Merge "Move permissions from base to standard manifest"
am: 95c5375a85

Change-Id: Ic15b12fd9656bb60aca616a8610df49e568a80e7