Merge "Allow system apps to define ephemeral permissions" into oc-dev
am: 0ddca92018

Change-Id: Ie68abfae227db1b5a62029671ab607ac38620ce3