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

Change-Id: I15d4b011df9fce9501867883415430c808d4a175