Merge changes from topic "am-6b985a78f67e4d82ae530a2f0aa4b413" into android13-tests-dev

* changes:
  Merge changes from topic "am-a88b61c7030544db8bb4a91e946fd0fa" into android12L-tests-dev am: da962ed -s ours
  [automerger skipped] Merge "Handle another case of exceptions of type 'Error' when accessing members through JNI." into android12-tests-dev am: e808e8d -s ours am: 932a30e -s ours

Author: android-build-merge-worker-robot