Merge "new System API for sim voice activation state." am: 16533c35d3
am: b332c39954

Change-Id: I18346531c31e9a8a593da18c1d07ee33f1650784