Merge "Hide "swipe up to unlock" when entering Doze" into qt-qpr1-dev
am: 24e8073af9

Change-Id: Ib53522a0ce8706c1a60806b1304a3b814d13cfa9