Merge "credstore: Never pass an empty challenge." am: e3421680c8

Original change: https://android-review.googlesource.com/c/platform/system/security/+/1323675

Change-Id: I504508174c7bdc947078f9f2840f2730b645c3ec