Merge "Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Close the logical channel after opening it" into nougat-cts-dev am: 7743a7e3a6 -s ours am: cfc0a3ecd0 -s ours am: 3116434f78 -s ours am: e50d3ea5f2
am: 7b7bc14d79

Change-Id: Ia9f8932164a5667a7ee710f6fd73e01b403721ee