Merge "Set up aconfig / new android.service.chooser flag" into main