Merge "Move 'privapp_whitelist_com.android.settings' to system_ext"