Merge changes from topic "revert_high_zone" into rvc-qpr-dev am: 4d0d51d7f5 am: c9dfe8998d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13330027 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0d0b3ce21c1de5639508ea577d01cd98436f1a3b
This commit is contained in: