[automerger skipped] Use preview_sdk_int for version code checks am: 0c8cdf54db am: 1311f427f5 am: 6031fcdad6 -s ours
am skip reason: Change-Id I59e327d4e92d41a93b6bea145b8497fd4f85108c with SHA-1 b6f32d9fe2 is in history

Change-Id: Ia2ef24bcedd50e79a991f340fb2689e5d0f2bdf7