Merge "Make framework-sdkextensions stubs use the new defaults" into rvc-dev...
Merge "Make framework-sdkextensions stubs use the new defaults" into rvc-dev am: bc2ea8f8 am: 8cfa4346 am: fc690c69 am: cf46d618
Change-Id: I501632a7f4b9260e6c00498b091b2ea8f60c5a4c