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: 2420b447 am: 5bde4b86

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



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