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: Ifd33521e4a693b491f95d2f4c5b31fb7dccbbc88