Merge "keystore: Change superclass of UserPresenceUnavailableException." into pi-dev am: aa5c335a60
am: 5860eff0c8

Change-Id: Iefba2f7d7eab8dd1834c3045737fc9bc96d32928