Merge "Restrict visibility of framework-module-common-defaults"