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

Change-Id: I628847c8d896abc8e6f0e0a439320148cd47ef28