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: 57d13811 am: 1d19aa0d

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



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