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

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



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