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

Merge "Merge "Use the default top clock margin on h800 devices" into tm-dev am: b865d49b am: 2420b447" into tm-d1-dev-plus-aosp am: 618e06a9

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



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