Merge "Fix toolbar keyboard navigation and touch." into 24D1-dev am: 4115a9a2

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



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