Merge "bullhead: Remove SBM's other mcc/mnc overlay" into mnc-dr-dev