Forward-port Android 9 changes to main

This brings the changes that have been brewing in xenial up to focal, and enables full biometryd functionality to android9 devices on focal.