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

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



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