am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS...
am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev
* commit '1e6048e0':
DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows