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

Change-Id: I281a7ca5437ce52034ced8aa9b03f497e27b9343