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

Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c4 am: 2f75ebed am: b4e5ddbe am: 46e6fc9f

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

Change-Id: Idafec177c32350899490960d9e44bb990c1f1d57