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

Change-Id: I3c36c63a67050106443d68150db41f1c1cccc5d8