[automerger skipped] Merge "Only delay bouncer if bypass is off" into qt-r1-dev am: 255777af56 am: c9b3e09ad4 -s ours
am: 323160dde0 -s ours
am skip reason: change_id I5ca00ebacda2c893bf62d5c882fe0a244b77f4fc with SHA1 055ef94e99 is in history

Change-Id: I94215b422414f2b3bf07aa135ac79a0dbb770e36