Merge "Move no cutout overlay packages to frameworks/base" into sc-dev