DO NOT MERGE Revert "Remove car version of Room library." am: 6f9e53ea6a

Change-Id: Icd5c36a89ee87e7f501838d2be465b1da85ce6c3