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

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

Change-Id: I3164791e6a8cd56faf22f9a378260aff8ace7405