Merge "Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am: a74fbef8ce" into pi-dev-plus-aosp
am: fe611a5700

Change-Id: I1aba793c0c71573e06d52f14aec823a4f6d3ad93