Merge "Merge "Fix margins and positioning for the small (implicit) face view." into udc-dev am: 482472ad am: 57d13811 am: 1d19aa0d" into udc-qpr-dev-plus-aosp am: 3d0d40b0

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



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