[conflict] Merge "Use root view's width instead of screen width" into android14-tests-dev am: 9a034b4ad9 am: 9e7c730a30 am: 33620bd77d

Original change: https://android-review.googlesource.com/c/platform/cts/+/2788015

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