Merge changes from topic "am-87c857412e5c40acb794d94d47a8b05f" into android13-tests-dev

* changes:
  [automerger skipped] Merge "DO NOT MERGE Update testapps targetSdkVersion for CtsDevicePolicyTestCases" into android12L-tests-dev am: dc439b456a -s ours
  [automerger skipped] DO NOT MERGE Update testapps targetSdkVersion for CtsDevicePolicyTestCases am: a133ee16a1 -s ours