Android R Beta 2
Merge "credstore: Don't require credentials to use ACP ids starting at 0."