Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9f8 am: 58554aed8a am: aa2c7c9f3e

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

Change-Id: Ic408e633adec039cdfd712cada986380c0955fc3