Merge "[automerger skipped] Merge "Revert^2: Hiddenapi tests: skip JNI on clinit error" into pie-cts-dev am: f2161b5057  -s ours"