commit 931810cc1206a6f36ccca9553517a541302f8503
author Aaron Holden <aaronholden@google.com> Tue Nov 08 13:28:37 2016 -0800
committer Xin Li <delphij@google.com> Wed Dec 21 11:38:06 2016 -0800
tree 2eb9213686e2208443c8cb2dc9d7b8ded5ed6927
parent f5c81c3c4e0f25a69213df92d700b0af290dd190

DO NOT MERGE: Remove shortname for session-id in SubPlanCreator

The short name "s" collides with the short name for tradefed's "serial" option and causes retry to fail for sessions specifying serial numbers.

Test: run cts -m CtsPreferenceTestCases -s <device-serial>, then retry with run cts -r <last session>
bug: 32703023
bug: 32707500
Change-Id: I0b71477a29f51bd8dfc81de1fd785da079499f17
(cherry picked from commit 6d72c231304d7b59c555dd0ee9711997dfda5421)
(cherry picked from commit 5175db05d66b26351e840936efd29a107e4953b8)