Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Close the logical channel after opening it" into oreo-mr1-cts-dev am: e04cb57e83 -s ours am: ddeca34a9e -s ours am skip reason: subject contains skip directive"