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: 2f75ebed am: 3e96041f" into rvc-qpr-dev-plus-aosp am: 319f0b4d

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

Change-Id: Idad9f2741939a3aa22753417c53092eaa0eed08f