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