Fix merge issue in CompatChangeTests am: 462d6473c0 am: b7f8bc0a33

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

Change-Id: If398bd3f8d9c94cffeffe337367f12ab1af24a06