Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
am: d6fd13ecc0
am: 7661f3a090
am: 1697b6c0ff
Change-Id: I9069fff5d4c94e859bd930fa44183bab981a650d
This commit is contained in: