Merge "Fix for testNonResizeableActivityHasFullDisplayBounds" into nougat-mr1-cts-dev