Merge "Add privileged API to control keyguard secure notifications"