[automerger] Revert "Fix lock contention while swiping up" am: daa47e7ccc

Change-Id: I66584ddff364de3ca11bf1a5941a3436f2bd0002