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

Change-Id: I621615c79bce6fea56072dde03a41d4f7c2ce5c0