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