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

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



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