Merge "Support revoke-when-requested with pre-M apps"