Merge "Fix for testNonResizeableActivityHasFullDisplayBounds" into nougat-mr1-cts-dev
am: 866f50b7dc

Change-Id: Ia244e1f160359b4611f4bbd82244d5f44abd8f5e