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

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



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