Merge changes from topic "am-a88b61c7030544db8bb4a91e946fd0fa" into android12L-tests-dev

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

Author: android-build-merge-worker-robot