Merge "Add setDisabledForSimNetworkLock to StatusBarManager"
am: f428f58080

Change-Id: I5cb8251d0f91e2c86f80e8b613fe763d77196d3a