Merge "[automerger skipped] credstore: Don't require credentials to use ACP ids starting at 0. am: 969d3803c8 am: 764af005ee -s ours" into rvc-d1-dev-plus-aosp