Merge "Make framework-sdkextensions stubs use the new defaults" am: 8044ce1b86

Change-Id: Ibf7c2939ffd3b04d682b6213823481508701f23d