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

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

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