Merge \"Fix bug in Sim Status Settings. am: fb87919fde am: be5fbd9954\" into nyc-mr1-dev-plus-aosp
am: 5806d78aa4
Change-Id: I7d3da62e1807e6d37886bddce1fae1ca1b06afbf
This commit is contained in: