Merge "Add adb commands to test udfps haptics" into sc-dev