DO NOT MERGE: Remove shortname for result-type in SubPlanCreator

Test: make cts, run unit tests
Bug:32871337
Change-Id: I5185b6adfe5cafa23f28e1a31d886c58ad06f543
(cherry picked from commit 66cc63a41552cf9554323695e80e6750d895c57e)
(cherry picked from commit 6bdfe0ce5fc2af285c93adbd789f0646b17f3bc4)
3 files changed