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

Change-Id: Ic7ae1006f1650653d75685b5a6d5b22e74b8f950