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

Change-Id: I7cbceeec5137a31ba65055c7db5fa21a91333e4d