Merge "CTS: Fixed SplashscreenTests for circular displays" into oc-dev
am: 6fc23902d2

Change-Id: I60735dcb4084038b83f4c4262173599fe2bfaad5