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

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