Merge "Enlarge EPSILON to 0.01 for android.display.cts.DisplayTest#testModeSwitch pass" am: b8c95a64 am: 5a55dce1 am: 6b4bfac7

Change-Id: Id175c9c575a12db7bb2aab13f842718be0746caf