Merge "Fix: AccountManagerService crashed by accessing closed db"
am: 6ac8f42d9e

Change-Id: I35f289e43a7406087a13258b5e6cbf5e179dc529