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