Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca

Change-Id: I1d486a18f7b0a9b7eb79ac3d28ebbdc0cdfa88c9