Merge "RepoPick: Actually skip merged commit instead of exiting" into cm-11.0
(cherry picked from commit 3fc224f6c24fffa91d4afea0a2480f65351adc85)