Merge "Remove permission for APEX manifest."
am: c3b3fdf8d6

Change-Id: Ia5f667f489270d1e73c5bb23387d400d045b837c