Merge "Factor chin size into dimension checking to determine if...
Merge "Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on." into cw-e-dev am: e94b3ba0 am: 9cae56e7
am: d7f0a33b
* commit 'd7f0a33b':
Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.