Merge "SystemUI: show owner VPN for restricted profile" into mnc-dev