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

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



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