Merge "Merge "Upate face sensor loc as resolution" into tm-dev am: 0ad655dd...

Merge "Merge "Upate face sensor loc as resolution" into tm-dev am: 0ad655dd am: 5b896412" into tm-d1-dev-plus-aosp am: dbd231e5

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



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