Merge changes from topic "revert_high_zone" into rvc-qpr-dev am: 4d0d51d7

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13330027

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I54d1ffacd32b374bfecd7e90d28ed9065f9bf84a