Merge "Upate face sensor loc as resolution" into tm-dev am: 0ad655dd am: bed68d04 am: 426e6be6 am: 37885ff1

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



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