[automerger skipped] java_sdk_library: Preserve sdk_version: "none" in snapshot am: 153501f6 -s ours
am skip reason: Change-Id Icf7c20dc109a773430768c1a2d91c674551dbc1b with SHA-1 780c5f47 is in history
Change-Id: I70bf9330beaa98207950cdc67025f4804b9a9f48