Merge "Merge "Stop using deprecated getParcelable method in AccountManagerService." into tm-dev am: 019015b6d4 am: 916057d17e am: ba2eb5ba91 am: 096a905a9e" into udc-dev-plus-aosp