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

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

Change-Id: If4cf0d3a62b4b5130412da7bd0c393e6affa8a9d