Merge "Enable R8 shrinking of standalone system server jar service-connectivity"