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

Change-Id: I220a0c20da167f3f1222c5ef1124717ad0532af7