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