Merge "Move MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA and MIGRATE_LOCK_ICON flags to aconfig" into main