Merge "Make AccountManagerService more resilient to database corruption." into qt-qpr1-dev am: ac0112ca90

Change-Id: Icd5eaafaa3a071faccdfd386d2b4ab9b7aea7b46