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

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

Change-Id: I7cec3b1c471e08b8c9601ff09d0c4911df75c208