Merge "Fix For UX Restriction Test Failure" into sc-v2-dev am: 504b2f3c6a am: ade82b3530

Original change: https://googleplex-android-review.googlesource.com/c/platform/platform_testing/+/16748426

Change-Id: I8ce689f6ec94f1b52c024cdbe0702a98f7d187e7
tree: 20c9bbb1023df29bef946ec0215fdba0610bc865
  1. build/
  2. docs/
  3. emu_test/
  4. libraries/
  5. scripts/
  6. tests/
  7. utils/
  8. PREUPLOAD.cfg