Merge "Add missing metalava options to framework-module-defaults"