Merge changes from topic "too_dark_face_acquisition_message_enable" into...

Merge changes from topic "too_dark_face_acquisition_message_enable" into tm-qpr-dev am: a12fe48a am: 9fd4043a

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



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