[automerger skipped] Merge "stubs inheriting from...

[automerger skipped] Merge "stubs inheriting from framework-module-stubs-defaults-* now works" am: fcccac54 am: ac8bceab -s ours am: 9d6b8147 -s ours am: aa5726f3 -s ours
am skip reason: Change-Id Icbbbddb4fb68055f27aa314983a9c556e51f037a with SHA-1 b4f8a852 is in history

Change-Id: I579bbf64d062bae08b95532f2b1aff65ad351ced