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

Change-Id: I28f349b3674126a85731489fd8119b41385934a7