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