am 61eb51b8: (-s ours) am 1e6048e0: Merge "DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows" into klp-modular-dev

* commit '61eb51b8f5fb9d747ce5e06c0799f81ff8ddac16':
  DO NOT MERGE Cherry picking 3 CLs to fix CTS testFitSystemWindows