Merge "Fix margins and positioning for the small (implicit) face view." into...

Merge "Fix margins and positioning for the small (implicit) face view." into udc-dev am: 482472ad am: 57d13811

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



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