[automerger skipped] Merge "Hide "swipe up to unlock" when entering Doze" into...
[automerger skipped] Merge "Hide "swipe up to unlock" when entering Doze" into qt-qpr1-dev am: 24e8073a
am: 2d2a9184 -s ours
am skip reason: change_id If7290459a3ae28f689cf4c9e2311398e5f6bcf13 with SHA1 85ea4205 is in history
Change-Id: I2efbfcc4d0d68ffe95c4e94d2bf665c8b81964d5