Contributes to waydroid#6 (closed) for xenial, see !1 (merged) for already merged focal counterpart.
xenial
focal