Merge "Remove MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA and MIGRATE_LOCK_ICON from teamfood" into main