Merge "APM: Add a test to prevent regressions like one from aosp/3020124" into main