Merge "Fix keyboard navigation work in Settings home page" into rvc-dev am: 8a2eb5e8bc am: 5520cb90ac

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

Change-Id: I4913aa78e4603bb5db638277bb1d8abb668df116