Merge "Update android.app.ui_rich_ongoing to use the new FR" into main