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

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

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