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

Merge "Merge "Fix crashes in UserDetailViewAdapterTest." into rvc-dev am: 73a4bfc9 am: 1086de18 am: 1622dee6" into rvc-qpr-dev-plus-aosp am: e1262c35

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

Change-Id: I1580fa421f15ab7f32483969bed5462ca786a1cd