Merge changes from topic "release_migrate_split_keyguard_bottom_area" into main

* changes:
  Release MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA
  Modify inflation of ambient indication area to handle merge layouts
  Release MIGRATE_LOCK_ICON