Merge changes from topic "am-e335adbd630d4c0789ec1821400a5cd6" into udc-qpr-dev-plus-aosp
* changes:
[automerger skipped] Merge "Immediately stop running face auth if the display is OFF" into udc-d1-dev am: 42f90671 -s ours am: f81672b6 -s ours
[automerger skipped] Immediately stop running face auth if the display is OFF am: cf5dace3 -s ours am: b665e22e -s ours