Merge "Check distraction flags in addition to suspension state" into qt-qpr1-dev
am: ad7f37d4fd

Change-Id: I6e164379eba0d29e02f07372d406d5cd38e0b541