Merge "Make ARM TVs running 32-bit userspace boot on V with new kernels." into main am: 6eee50614d am: 1d27183ea4

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/3391981

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