Merge "Update lint-baseline.txt for android.test.mock" into rvc-dev am: 1de67aa2 am: b26acf7c am: e55db8b9 am: 5be61dde Change-Id: If950d4bb8e27682461844eb160d341bf3a0aef9c