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

Merge "Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c4 am: 57757844" into rvc-d1-dev-plus-aosp am: edc887c7

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

Change-Id: Iac7f99f85b4bea509a3d015be984eb7f2464bffe