Merge "Remove hack that was added in place of FaceManager fix" into udc-qpr-dev am: 84c14218f6

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

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