Merge "Skip test on user build due to framework behavior." into pie-cts-dev
am: f9a2ad688e

Change-Id: I08cce7f6de45f7681bc238966cb01b8d589bbbdf