[ Merge of http://go/wvgerrit/65442 ] This also requires the removal of sub session related code as references were removed from the proto. Bug: 119077124 Test: WV unit/integration tests Change-Id: Ida1a591afc267ec97344e5bba00bbf401887a202