Merge "Hide hidden apk-in-Apex of mainline modules from the app list" into main