Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e7225879 am: 2287f6e2

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



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