Merge "Remove phony module vndk_apex_snapshot_package and add its required modules to auto-included-modules" into main