Merge changes Iebd26509,I57a69f05 into main

* changes:
  APM: Add a test to prevent regressions like one from aosp/3020124
  Fix parsing of legacy engine config XML files