Code refactor for session design of availability status config. Bug: 141833767 Test: manual Change-Id: Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657