Merge "Use androidx's Pair in getDisplayNameAndAvatarUri()" into pi-car-dev am: 8ac29fab74
am: dae3cd30a1

Change-Id: Idece2355157f7c66bca74b1798444579f75fa6d0