Merge "Report anomaly when config change with subId maps to invalid phoneId" into main