Merge changes from topic "am-64fd07e3a9cf44989cc48feb23cda3bc" into main

* changes:
  [automerger skipped] Merge changes from topic "oom-ams-subreason" into main am: 8b901f01e0 -s ours am: cde990a358 -s ours
  [automerger skipped] servicestest: add jni dependency am: babb922082 -s ours am: 7ea4f5d0e2 -s ours