Merge "DisplayCutout: make dock divider cutout aware" into pi-dev
am: f5239f00c5

Change-Id: I7bc25667a3c42ef683b8c656268686fc663c5ce4