[automerger] Merge "Don't back up Assist Gesture setup/sensitivity" into pi-dev am: a74fbef8 am: 114e58a6 Change-Id: I72e82a69c75b1ad155dcb8c657175248b68442ab