tree db3c31ae1a3ed24c2173035708d5433fc3a2f54a
parent 95eb6ea09788bd79c59a287bb860425a02de976e
parent a46ec407d2add2bbc5924ba04585a3d1c99c5cc7
author Lucas Dupin <dupin@google.com> 1568055074 -0700
committer android-build-merger <android-build-merger@google.com> 1568055074 -0700

[automerger skipped] Merge "Do not show status bar on first bypass attempt" into qt-qpr1-dev am: bdab885dba
am: a46ec407d2 -s ours
am skip reason: change_id I52b3eee95a3ee67c3ec215d8b582967f900da4c8 with SHA1 4b75b192a8 is in history

Change-Id: I41be606e1d64e742224ffcd769a9e0d84192dd3f