Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba099 am: 9cae56e7b6
am: d7f0a33bf1

* commit 'd7f0a33bf1cfc9ac78639dd65afb70e1a008a5a8':
  Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.