Merge "Add setDisabledForSimNetworkLock to StatusBarManager"