Merge "Use public API to determine apk-in-apex" into main