[automerger skipped] Merge "Add missing metalava options to framework-module-defaults" am: b5cde119 am: 4b13bcbd -s ours
am skip reason: Change-Id I7a852149e3e12c3cb9083b2d0ca483cc55f6348f with SHA-1 56195fba is in history
Change-Id: I368c6075eb9f52450dc69d350d185e3d8874d3ed