Merge "Fix broken tests in android.accounts.cts.AccountManagerTest." into lmp-dev