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: 55afe487

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



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