Merge "[Settings] Code refactor for availability session" into rvc-dev am: 07431066c4
am: 9d6ba23df3
am: 8c6cf27814
Change-Id: Iee35d8fc0b73c5068f791a5d161dc96438be4d56
This commit is contained in: