RESTRICT AUTOMERGE: Fix security bug

Small bug fix - || instead of && causing flickering and incorrect layer
removal

Bug: 150845631, 137284057
Test: build, boot, SurfaceFlinger_test, libsurfaceflinger_unittest,
manual

Change-Id: I6c4e5239254300c70b802aa935fb638412a445ee
1 file changed