Merge "credstore: Don't require credentials to use ACP ids starting at 0." am: 9cc2e83059 am: 8b10eced4b

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

Change-Id: Ieb57e2b85688d21b0c2910f624d263b20d6b6ae6