Merge "Provide a way to specify complication margin." into tm-qpr-dev am: e84cc4cd

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



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