tree bc41d740ae20988f38e4dd33dd86712764090c08
parent b9d4d6a9fb42975bf4e94e3aed1ca4d01dba23b9
parent aac2e8c6879437a8d947b39f5d0a2d9fdce26412
author Beverly Tai <beverlyt@google.com> 1555680393 -0700
committer android-build-merger <android-build-merger@google.com> 1555680393 -0700

Merge "Check zen modes+manual rule for in consol zen pol" into qt-dev
am: aac2e8c687

Change-Id: I83a4324c0baba01e7ab6582d3a02afcfe5c0db9c