Merge "Rename StatusBarManager#setDisabledForSimNetworkLock"