Don't let the user set a static redirect flag on a non-redirect

Bug: 61865
Change-Id: I417d7a5e179f46022652a267de41fb4de8525391
Merge "Don't let the user set a static redirect flag on a non-redirect"