Merge "Fix issue where FlpHardwareProvider can crash if GmsCore re-registers a sink." into lmp-dev