Merge "Merge "Check distraction flags in addition to suspension state" into...
Merge "Merge "Check distraction flags in addition to suspension state" into qt-qpr1-dev am: ad7f37d4" into qt-qpr1-dev-plus-aosp
am: c616be6f
Change-Id: Ife2760d991e123fa643e583f4101edca807a1a07