[automerger skipped] Merge "Remove framework faceDetect requirement" into...

[automerger skipped] Merge "Remove framework faceDetect requirement" into tm-qpr-dev am: 29640945 am: ee4a8619 -s ours

am skip reason: Merged-In I24bbfdd39135bcb1cf1d670ee8bd7b13e5f27d60 with SHA-1 ddeceea2 is already in history

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



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