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

Merge "Merge "Fix margins and positioning for the small (implicit) face view." into udc-dev am: 482472ad am: 2492e844 am: f3532570" into udc-qpr-dev-plus-aosp am: 6fcbaf39

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



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