[automerger skipped] Merge "Fix availability status for AOD gestures" into pi-dev am: 39f98e9018
am: 94b265ffe7  -s ours

Change-Id: I4eb4d086a1ad220969ce9f3ae90618db628a02f6