Merge "[PM] Add the flag for providing info of APK-in-APEX" into main