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