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

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

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



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