[automerger skipped] Merge "Change default value for face metrics" into...

[automerger skipped] Merge "Change default value for face metrics" into rvc-qpr-dev am: 9d0d3822 am: 16e5486a -s ours

am skip reason: Change-Id I97cf06969bdfeb45aa3d0d8c0449a3f4b72fc32f with SHA-1 afbf21fd is in history

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

Change-Id: I33a8221c186998cd32479b0f0662c22a87a10b3f