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