Merge "Keystore 2.0: Fix wrong exception returned on not authenticated." am: 89ec9d42d9

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1538989

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I21d059008c3a6a0ae1444d4572b4d0b6d39d254c