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

Change-Id: I9eac5d82c0b5e3eb5593407aa2eb82cb8c71dc2e