DO NOT MERGE: CDD Annotations for Section 3.8.3

 CDD annotations relevant to section 3.8.3 ( handheld devices) and 3.8.3.1
 fixed imports

 Fixed typo to build it successfully

 Bug: 111354023

 Test: make cts

Change-Id: I1696164de0935ca39570aa5f7617292ecea5e20d
4 files changed