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

Change-Id: I297b481892c75babde5b239bf6b1fe4e3701244e