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