Merge "Remove redundant qualifier name." into tm-dev am: 5f7c919004 am: a17acdf5ef

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/Nearby/+/17050372

Change-Id: I1786d272c4b6b8b04f139b6b1fff3db5622d420f