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

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