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

Change-Id: Id3ea80c30e149588a6d97f02df978f258dda3495