Merge "Merge "Update string kg_face_sensor_privacy_enabled" into tm-d1-dev am:...

Merge "Merge "Update string kg_face_sensor_privacy_enabled" into tm-d1-dev am: b790e477 am: a4fd26aa" into tm-qpr-dev-plus-aosp am: 006274d1

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



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