Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Close the logical channel after opening it" into nougat-mr1-cts-dev am: 857ce7ea93 -s ours am: 7bd21f6e65 -s ours
am: ae1c68f081 -s ours
am skip reason: subject contains skip directive

Change-Id: I701776629e53dce9fafaf87f045ba1dbf57dd70e