Merge "Restrict visibility of framework-module-common-defaults" into mainline-prod