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

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

Change-Id: Iee3f5a3aa710f51c46b70ee3fe2edd38137307b0