[automerger skipped] Merge "Add missing metalava options to framework-module-defaults" am: b5cde119 am: 4b13bcbd -s ours am: 6907e0ae -s ours am: f15ea3eb -s ours am: 61166aed -s ours

am skip reason: Change-Id I7a852149e3e12c3cb9083b2d0ca483cc55f6348f with SHA-1 56195fba is in history

Change-Id: Iea8c462d5ff6a30bab9fb7f29286c1f1ffa2b4d7