Merge "Consolidates config_windowOutsetBottom and circular_display_mask_offset" into cw-e-dev am: 36da2a208e am: c45009906a
am: a05beb29da

* commit 'a05beb29dac5c05a610783469566cf865d92a140':
  Consolidates config_windowOutsetBottom and circular_display_mask_offset