Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d025 am:...

Merge "Wear Recovery UI: Adjust for round screens" am: a7d1d025 am: 2b4e47be am: 0f18ef7b am: 43899799 am: 2e95c437

Original change: https://android-review.googlesource.com/c/platform/bootable/recovery/+/2623222



Change-Id: I93ecf90de318c1133fb1926e0f35cac4b04f52d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>