Merge "Remove redundant margin update, which caused infinite layout loop."...

Merge "Remove redundant margin update, which caused infinite layout loop." into sc-dev am: a39cdd12

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

Change-Id: Id5725a353190c825bfcb315de3c8e942c0ff7ca8