Conflicts: apps/CtsVerifier/AndroidManifest.xml tests/expectations/knownfailures.txt Change-Id: I1b918333883e0f3d651e9f4d65918974eaa3b72f