Merge "Use the default top clock margin on h800 devices" into tm-dev am:...

Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b am: 38ff7fa0 am: 11c53df8 am: d8df34dd

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



Change-Id: I1f2d8a86560a9be2a9d46b8ad9a3c13de6d7bc80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>