Merge "Revert "Disable input-vdex when doing speed-profile."" am: eebbf2e371 am: b8d5b100d1 am: 87de761742
am: a4a4811a21

Change-Id: I8cf4a2efc2530854d442b34d73d75d724f2675f0