[automerger skipped] Add framework-module-defaults for java_sdk_library am:...
[automerger skipped] Add framework-module-defaults for java_sdk_library am: 13e67afc am: 7b260848 -s ours am: 8308e7ad -s ours
am skip reason: Change-Id Icd5b893b080d3a8b92b11b856a71b700be96dafa with SHA-1 bee7404d is in history
Change-Id: I79c036fe004b419bea948506ca2b514ac5b34b9d