Merge "Add missing metalava options to framework-module-defaults" into rvc-dev am: bce5e9724f

Change-Id: I852ff9f33b7e04f14118f30ade1c8c039d137907