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

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

Change-Id: I0f08b2fd1008a50344d6078148247344c2a755b0