email: bypass policy -- port to lollipop [2/3]

Change-Id: I47ae3e808caad44dbb1c35de83c6a7b09a8b6f7c