Merge "Do not revoke POST_NOTIFICATIONS for pre-M apps"