Co-authored-by: Michael Bestas <mkbestas@lineageos.org> Change-Id: Ia41bd580fc8dc698033122751716485eb2001fe0