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

Change-Id: Ia6b73bfbf0283d3cdfa25280f1ed1fdc619791bb