Revert "DO NOT MERGE Remove unintended face config am: 875235afbf"

Revert submission 18799414-am-e98f52416a40436ba0044e72d6feed21

Reason for revert: The merge path was only meant for tm-dev.
Reverted Changes:
I6ace51cab:DO NOT MERGE Remove faceauth from raven am: 783e56...
I049a9c205:DO NOT MERGE Remove unintended face config am: 875...
I50ae185c6:DO NOT MERGE Remove unintended faceauth configs am...

Change-Id: I0b0c885ecb47e94d3327c7436d61b07a58c999d5
1 file changed