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

Change-Id: I3ec636cd526bcdb749fc3af87f2ac0d301fbcafd