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

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

Change-Id: Iaf457d74486652b4731c99293ae6dfa190518a6d