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

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

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



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