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