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

Change-Id: Iba1881c5ec53168ee0352eb0ebd4b7ab689e52bc