Merge "Add test API for if the device supports QS" into oc-dev
am: be436bdefe

Change-Id: Ia882b3d7e7ab25c8b1426f478adadad8432c18f2