Merge "keymaster: provide instance name to getService()" into pi-dev
am: 7b74f4eb48

Change-Id: I54617a7788b7d9a19aee559e372cbee240d51539