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

Change-Id: I17aab296d5c61f5b8d224b83367d558d15d134e3