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: 7a8bb143 am: 8083a992
Change-Id: Ia06b659509d7f35ebcc59313d737189cb8d22906