[automerger skipped] [RESTRICT AUTOMERGE] Remove conformance version test from Android am: fad17eec2d -s ours
am: 9db88aa193 -s ours
am skip reason: subject contains skip directive

Change-Id: I24e7a955a0a5701c49ce82c78b8f1a147838988f