Merge "Move UdfpsDisplayMode to AOSP" into tm-qpr-dev