Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9f8 am: 1086de18d6 am: 07ff7a822a

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12108112

Change-Id: I2956e33febe91bde86f0e026835321edd129a2ee