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

Change-Id: I1478b9c2bb12b6bfd161be99c5faa7aec76d9a7f