Merge "Give touch boost higher priority than idle detection" into rvc-dev am: 0abfdcad57 am: 472c55f7cb am: fa5767302a am: fd8bef38bc

Change-Id: I1a13adfe517aec0e59182b46480ddaa31e3999d9