Merge "Merge "Use spy in PermissionMonitorTest." am: df01b11de1 am: 999733c5fa am: 9c10dcc0f1"