Merge "Update lint-baseline.txt for android.test.mock" into rvc-dev