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: 2492e844 am: f3532570

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



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