Merge "Update robolectric dependency to v3.6.2." am: cc54c93376 am: 9ff0f548a9
am: a81b5b481c

Change-Id: I5b3a002415a11a71d72e3a35a86d40a6ccf0a045