Merge "Merge "Merge "Start fingerprint user client on reboot" into udc-dev am:...
Merge "Merge "Merge "Start fingerprint user client on reboot" into udc-dev am: a539a7f3 am: 9c667667" into udc-d1-dev-plus-aosp am: 4eb94fdb" into udc-qpr-dev-plus-aosp