Avoid key conflict errors in User::addToDatabase

* Also cleaned up the IDBAccessObject constants to cover more cases.

Bug: 66185
Change-Id: Ide28af552b3c59428923b373c0f5764414d50a1f
Merge "Avoid key conflict errors in User::addToDatabase"