Merge "Allow apps to bypass Power Save restrictions when launched from a...
Merge "Allow apps to bypass Power Save restrictions when launched from a Notification\'s PendingIntent." into nyc-dev am: efa291a8
am: feaa8982
* commit 'feaa8982':
Change-Id: I212cf91074757314c749114457416296a9206e08