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

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

Change-Id: I70bf395ae415f83733d96664b6458b8348b45e79