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

Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709 am: 260e8f8c am: 047cee8f am: 5caeb029

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



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