Merge "Fix failing compat utils related unit tests on S." into tm-mainline-prod am: 55ac0f80f3 am: 3a3c98d234

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/AdServices/+/21468367

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