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

Change-Id: I82f8d0fe2b38a8bfb23b8aab0fd2c8f5818802ec