Merge "Add missing metalava options to framework-module-defaults" am: b5cde11961

Change-Id: Ib99fcccf335e82119e73d649dfa3e0a9fb3df3a3