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
* commit 'e94b3ba0':
Factor chin size into dimension checking to determine if CircularDisplayMask can be turned on.