[automerger skipped] Merge "[Settings] Code refactor for availability session" am: d7dbfe04ca am: 2673571d28 -s ours am: 040cd610f6 -s ours
am skip reason: Change-Id Ia4982bc4036abbcff5ee1a4bba69bdf6f70ad657 with SHA-1 7ea8e7ef1e is in history
Change-Id: I8e1a49fbd757e442296fde014cbdc01244824b36
This commit is contained in: