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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7f17f052e551c14ccdfcdb193f2648f779548999