Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev