Merge changes from topic "hearingAidsInT" into tm-dev am: c3bbb709 am: de39f473 am: 8846e29a

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



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