Merge "Disable input-vdex when doing speed-profile." am: 028ad63e80 am: a5582c290c
am: a15409a340

Change-Id: I3261131e0f71f6305cdb177ef227ab114be23c60