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

Change-Id: I671ee268daba3eea7922fb878de2d1e8963587bf