Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e

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

Change-Id: I56a6494e50665fa4e53e88fb3cff0604a1e1f4a9