Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709 am: 260e8f8c

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



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