Merge "Add setDisabledForSimNetworkLock to StatusBarManager" am: f428f58080 am: 33d3e85975 am: e219088375

Change-Id: Ie4ede0037ee0c209e31c572c805948a17a83a6e4