Merge "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: 10a2cc4bdc -s ours am: a2b605ce36 -s ours am: c2f9a9f4b6
am: a6f207e01f -s ours
am skip reason: subject contains skip directive

Change-Id: I7732530e1c3e61c4d6bfe1379cfeb1afae6b858b