Merge "Fix non-hearing devices show in pair new hearing devices page" into udc-dev am: 59fa9de0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23155081



Change-Id: I51b54455d5c2dd73c380fac22b345bc83570397f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>