Merge "Remove a break so that FLAG_PERMISSION_REVOKE_WHEN_REQUESTED is applied to permissions in all users." into qt-qpr1-dev
am: 73a2697d84

Change-Id: I85091c8457fda60011adf0e814e425649f998607