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

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

Change-Id: I6a9fd106f2ec9df817a6d1b5ac8d3b11e227542e